Autogenerated HTML docs for v1.7.2.3-313-gcd15
diff --git a/merge-strategies.txt b/merge-strategies.txt index a5bc1db..049313d 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt
@@ -40,6 +40,18 @@ theirs;; This is opposite of 'ours'. +renormalize;; + This runs a virtual check-out and check-in of all three stages + of a file when resolving a three-way merge. This option is + meant to be used when merging branches with different clean + filters or end-of-line normalization rules. See "Merging + branches with differing checkin/checkout attributes" in + linkgit:gitattributes[5] for details. + +no-renormalize;; + Disables the `renormalize` option. This overrides the + `merge.renormalize` configuration variable. + subtree[=path];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to
